From 3b3122ee066350badef46204cad31325c6da97e1 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 16 Feb 2008 01:37:47 +0000 Subject: [PATCH] Don't add the same target atom twice. (#516087, Christian Persch) 2008-02-15 Matthias Clasen * gtk/gtkselection.c (gtk_target_list_add_text_targets): Don't add the same target atom twice. (#516087, Christian Persch) svn path=/trunk/; revision=19589 --- ChangeLog | 5 +++++ gtk/gtkselection.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 304aaca377..96dbcd00b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-02-15 Matthias Clasen + + * gtk/gtkselection.c (gtk_target_list_add_text_targets): Don't + add the same target atom twice. (#516087, Christian Persch) + 2008-02-15 Matthias Clasen * tests/testfilechooser.c: Add a --backend option. diff --git a/gtk/gtkselection.c b/gtk/gtkselection.c index 5a419bcad9..bc9c41e42f 100644 --- a/gtk/gtkselection.c +++ b/gtk/gtkselection.c @@ -338,7 +338,8 @@ gtk_target_list_add_text_targets (GtkTargetList *list, gtk_target_list_add (list, text_atom, 0, info); gtk_target_list_add (list, GDK_TARGET_STRING, 0, info); gtk_target_list_add (list, text_plain_utf8_atom, 0, info); - gtk_target_list_add (list, text_plain_locale_atom, 0, info); + if (!g_get_charset (NULL)) + gtk_target_list_add (list, text_plain_locale_atom, 0, info); gtk_target_list_add (list, text_plain_atom, 0, info); } -- 2.30.2